Cavity shaving